From d6af4258a31148f23ca65b5d215f9849d8ea3f54 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Fri, 21 Jan 2005 02:08:45 +0000 Subject: [PATCH] bitkeeper revision 1.1159.223.11 (41f0642dZhTGBhGAWv7_RECYAOxMhA) Update defconfig for linux 2.4.29 --- linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 index ca10b9ef72..4769ac7822 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 @@ -130,7 +130,6 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_MD is not set # CONFIG_BLK_DEV_MD is not set -# CONFIG_IP_NF_NAT_LOCAL is not set # CONFIG_MD_LINEAR is not set # CONFIG_MD_RAID0 is not set # CONFIG_MD_RAID1 is not set @@ -161,11 +160,6 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set -# -# Appletalk devices -# -# CONFIG_DEV_APPLETALK is not set - # # IP: Netfilter Configuration # @@ -202,7 +196,6 @@ CONFIG_IP_NF_NAT=m CONFIG_IP_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m -# CONFIG_IP_NF_NAT_LOCAL is not set # CONFIG_IP_NF_NAT_SNMP_BASIC is not set CONFIG_IP_NF_NAT_IRC=m CONFIG_IP_NF_NAT_FTP=m @@ -232,11 +225,6 @@ CONFIG_VLAN_8021Q=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set - -# -# Appletalk devices -# -# CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set CONFIG_BRIDGE=y CONFIG_BRIDGE_NF_EBTABLES=m @@ -427,6 +415,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_SCSI_MEGARAID=y # CONFIG_SCSI_MEGARAID2 is not set CONFIG_SCSI_SATA=y +# CONFIG_SCSI_SATA_AHCI is not set # CONFIG_SCSI_SATA_SVW is not set CONFIG_SCSI_ATA_PIIX=y # CONFIG_SCSI_SATA_NV is not set -- 2.30.2